Skip to content

[s2i_content_set] Resolve promoted S2I images for OpenStackVersion - #4167

Open
rebtoor wants to merge 1 commit into
openstack-k8s-operators:mainfrom
rebtoor:feature/anvil-275-s2i-content-set
Open

rebtoor wants to merge 1 commit into
openstack-k8s-operators:mainfrom
rebtoor:feature/anvil-275-s2i-content-set

Conversation

@rebtoor

@rebtoor rebtoor commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add a s2i_content_set role that resolves a hash-stable S2I content set (s2iCommit + image digests) from a pin file, a post-merge catalog, or Quay labels, then emits cifmw_set_containers_images for edpm_prepare.
  • Wire it into deploy-edpm.yml behind cifmw_s2i_content_set so operator jobs can consume quay.io/openstack-s2i-containers without racing :master-latest.
  • Preserve unlisted OpenStackVersion keys so unmapped services stay on payload defaults.

Related-Issue: ANVIL-275

Test plan

  • Molecule s2i_content_set (catalog + inspect plays)
  • cifmw-molecule-s2i_content_set in Zuul
  • Exercise with the openstack-operator openstack-operator-tempest-multinode change (Depends-On)

Made with Cursor

@qodo-code-review

Copy link
Copy Markdown

Qodo reviews are paused for this user.

Troubleshooting steps vary by plan Learn more →

On a Teams plan?
Reviews resume once this user has a paid seat and their Git account is linked in Qodo.
Link Git account →

Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center?
These require an Enterprise plan - Contact us
Contact us →

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/128f784c7c0549fb90ed1a9f40869475

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 05s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 23m 12s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 17s
cifmw-crc-podified-edpm-baremetal-minor-update NODE_FAILURE Node(set) request 099-0000195774 failed in 0s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 36s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 2h 26m 11s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 32m 30s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 24s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 04s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 6m 01s

@rebtoor
rebtoor force-pushed the feature/anvil-275-s2i-content-set branch from 4de1d9a to 1fbce2f Compare September 10, 2026 07:26
@rebtoor
rebtoor requested a review from a team September 10, 2026 07:26
Comment thread roles/s2i_content_set/handlers/main.yml
Comment thread roles/s2i_content_set/defaults/main.yml
Comment thread roles/s2i_content_set/tasks/emit.yml Outdated
Comment thread roles/s2i_content_set/tasks/inspect_set.yml
danpawlik
danpawlik previously approved these changes Sep 10, 2026
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/49e15652baa1405c9c79a674c82b6791

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 18m 34s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 19m 59s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 33m 39s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 1h 58m 32s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 56s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 1h 12m 15s
cifmw-crc-podified-edpm-baremetal-bootc FAILURE in 28m 19s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 32s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 43s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 6m 16s

Comment thread roles/s2i_content_set/molecule/default/files/skopeo
Comment thread roles/s2i_content_set/tasks/write_artifact.yml
Comment thread roles/s2i_content_set/defaults/main.yml
Comment thread roles/s2i_content_set/molecule/default/files/content-set.yaml
Comment thread roles/s2i_content_set/defaults/main.yml
Comment thread roles/s2i_content_set/tasks/inspect_set.yml

@evallesp evallesp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/19c20ec4db454deb8f432ab82d9e04cd

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 00m 54s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 22m 00s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 36s
cifmw-crc-podified-edpm-baremetal-minor-update NODE_FAILURE Node(set) request 099-0000199327 failed in 0s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 43s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 3h 21m 15s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 24m 42s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 26s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 34s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 23s

@rebtoor

rebtoor commented Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

recheck

@michburk michburk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci

openshift-ci Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michburk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/07e7a9b1b9ce4c35bb1d310278a43283

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 19m 00s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 23m 11s
cifmw-crc-podified-edpm-baremetal NODE_FAILURE Node(set) request 099-0000199540 failed in 0s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 1h 56m 35s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 42s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 2h 03m 13s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 26m 26s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 39s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 32s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 36s

@rebtoor

rebtoor commented Sep 14, 2026

Copy link
Copy Markdown
Contributor Author

/override rdoproject.org/github-check

@openshift-ci

openshift-ci Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

@rebtoor: Overrode contexts on behalf of rebtoor: rdoproject.org/github-check

Details

In response to this:

/override rdoproject.org/github-check

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@rebtoor
rebtoor disabled auto-merge September 15, 2026 08:44
Operator jobs need a hash-stable service content set rather than racing
quay.io/openstack-s2i-containers :master-latest. Resolve s2iCommit once
(from a pin, catalog, or image label), emit cifmw_set_containers_images,
and keep unmapped services on payload defaults.

Related-Issue: ANVIL-275
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Roberto Alfieri <ralfieri@redhat.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@rebtoor
rebtoor force-pushed the feature/anvil-275-s2i-content-set branch from 3e761d3 to 2459b92 Compare September 15, 2026 08:46
@openshift-ci openshift-ci Bot removed the lgtm label Sep 15, 2026
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/f5a23eb54c3e435a9af6dbbb3110d4f7

openstack-k8s-operators-content-provider FAILURE in 5m 14s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal-minor-update SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 4m 19s
openstack-k8s-operators-content-provider-bootc FAILURE in 9m 47s
⚠️ cifmw-crc-podified-edpm-baremetal-bootc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider-bootc
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 01s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 02s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 20s

@rebtoor

rebtoor commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

Recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/4f96a84af3ec4b56b8097471748fe890

openstack-k8s-operators-content-provider FAILURE in 5m 04s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal-minor-update SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 4m 20s
openstack-k8s-operators-content-provider-bootc FAILURE in 10m 17s
⚠️ cifmw-crc-podified-edpm-baremetal-bootc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider-bootc
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 05s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 23s
cifmw-molecule-s2i_content_set FAILURE in 4m 53s

@brjackma

Copy link
Copy Markdown
Contributor

recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/f3b7d8856f094a9bb9e3471e6a4521f1

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 37m 24s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 22m 42s
cifmw-crc-podified-edpm-baremetal NODE_FAILURE Node(set) request 099-0000205008 failed in 0s
cifmw-crc-podified-edpm-baremetal-minor-update NODE_FAILURE Node(set) request 099-0000205009 failed in 0s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 16s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 2h 55m 38s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 25m 22s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 57s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 09s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 14s

@brjackma

Copy link
Copy Markdown
Contributor

recheck

@rebtoor

rebtoor commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

@brjackma care to read a lgtm?

We can override the zuul check...

@rebtoor

rebtoor commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

/override rdoproject.org/github-check

@openshift-ci

openshift-ci Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

@rebtoor: Overrode contexts on behalf of rebtoor: rdoproject.org/github-check

Details

In response to this:

/override rdoproject.org/github-check

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/92ae226e58e247e2b165b11ef82b4c4f

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 53m 19s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 22m 36s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 35m 38s
cifmw-crc-podified-edpm-baremetal-minor-update NODE_FAILURE Node(set) request 099-0000206069 failed in 0s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 23s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 2h 24m 20s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 29m 48s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 23s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 34s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 30s

@brjackma

Copy link
Copy Markdown
Contributor

/lgtm

@brjackma

Copy link
Copy Markdown
Contributor

recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/7d1dbb266fb54406b2bee3553c366383

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 16m 19s
podified-multinode-edpm-deployment-crc POST_FAILURE in 1h 22m 20s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 08s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 1h 58m 23s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 37s
✔️ openstack-k8s-operators-content-provider-bootc SUCCESS in 3h 51m 48s
✔️ cifmw-crc-podified-edpm-baremetal-bootc SUCCESS in 1h 26m 11s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 39s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 03s
✔️ cifmw-molecule-s2i_content_set SUCCESS in 5m 29s

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants